Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Dec 2011 18:08:42 +0000 (10:08 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 12 Dec 2011 18:08:42 +0000 (10:08 -0800)
commitfbba4800e2d36a43c9975a628bf60ba07e86e636
treea6ae61994c5dc11699c826b4f804c401562e91c8
parente067edd9fb6039c21cfff92bbbd44b2af6aef889
parenta6c4aa01a4f1a30be011a8bbfd609133a5d65e7f
Merge from trunk.